more hacking in comp/decomp