- fix log4j input variable name bug (#635, etc)
- some style fixes