Fixed some bads; added more prints