Fixed some things to be more correct