tweaks, removed prints