added more logs and such