Fixed stuff, first upload commit