quick fixes/improvements

gotta go to class :S