log bugfix
scm mapping
calc handler cleanup