Minor changes, started to reintroduce binding options