little tweaks to dice regex
Move listeners out of main class