Fixed some code and other things, for start