tweaks to x-plus modules, particularly events which looked messed up