removed console logs, some cs fixes