Some regex generating bugs fixed + new puzzles