Fixed most of the things