Siemer tweaks

merging SiemerTweak branch