merge fixes from clymation branch