Fixed binding issue introduced in last commit, also made more fixes to binding