made inner classes in the eventListener
fixed basic duster block