FIX a lot of bugs