fixed some syntax issues
configuration files
input bindings in separate file
merge