add tweaks and handlers