fix misc. tiny improvements / details