fixed stuff. and stuff. and removed rubbish