several changes and fixes
several chages and fixes. File changes, input changes
merged with dev