Fixed most stuff, need to check on course