add crop, and make things a bit less smelly