Bait food implementation + some improvements / bug fixes