Fix dependencies
Fixing name discrepencies
Fix bindinghandler to only occur when we want it to occur