more tweaks and asterix