Fixed errors, working on more