various fixes - hard to describe. from now on smaller commits