(incomplete) Bugfixes, started crop feature