Finished  fixings for errors (#8)