Log cleanup, preference fixes and receiver refactor