Final commit, fixed some small errors