Fixed newb bugs