Welcome to the forum!
I have to say that this actually looks great for a first mod (it's much better than mine!)
I believe this puzzle has been made before, but still wonderful work so far!
In order to fix popping/lockups, it looks like you need to cap the hollow pieces with plastic sheet. Just cut out a square, glue it on top of the gap, and sand it down.