removed more logs, and updated error logging