Fix regex and other issues (hurray working from memory...)