Fix development and add some more baked