Tidied up live bindings etc