Faster and with better puzzles
Small simplifications
Cleanups