tweaks to make this a usable module