Fixed bug with false variable names & added crop support