First Commit test

Fixed some inputbugs