initial cleanup to make it work
duh
rework old bindings and options