added a few more tweaks and fixed the literal-in-list problems