Fixed bugs Galore