cleaned up
some changes to Input. new factory interface
Merge remote-tracking branch 'origin/master'