fixed comments, extra crap floating around