code cleanup
refactor log_view killing; untested
Merge branch 'master' into home
fix bugs