changes to the feeder and bees, so they work

lots of changes here, will throw in some tests tomorrow for sure :)