removed some prints, squashed some bugs