Add tone mapping; clean up