Cleaning up some logs, editing function assignments