Fixes!

Fixes for Cropblocks and others, maybe some refactoring, idk