Fixed some errors, but many more to go