code-improvements, mostly related to @xchrdws comments