Commented out some stuff - and fixed a few bugs