User input now works + minor changes