KitchenSink update and some bug fixes