Slim down more and fix bugs