Updates made to 0.1.0 (aka no idea what i did)
Patches to listeners