some other tweaks
as of 2014-12-21 @ work