Cleanup & Fix for fills

cleanup. this is a fix against an older version of the addon, will
update shortly.