Alot of errors fixed, more to come