#81 Fixed some small mistakes. Still more work to do