some KitchenSink inspired changes