Fixed input bugs, refactored some code
New effects?