bug fixes and better farming