Bug/Mistake fixes