- Fixed some minor stupidity