Fixed some minor stuff
Some basic stuff done