handlers & refactor fixes