fixed biscuit usage, cleaned up some code