fixing lots of bugs etc
adding stuff