fixes, removed console logging