Fixed some small errors

Still more to fix