fixes

I've just noticed that there is already something similar to the CroppingLabel class, but you probably want to get rid of that borrowed stuff anyway.