0.014: logging, some code clean-up