Clean up generation fragments

Minor bug fixes + renames