Update from feedback

Still have to add effects on input interactions.