Fixing small bugs and starting with new input system