Fixed various shop and input related bugs