Bindings parameters reordered
Cleaned up binding reading
more cleanup