Compact generation + points

Also moved some things earlier