Fixed bindings, reorganized code. Some data still does not save to DB on
disable...