Fixed some errors from the initial commit