Fixed performance and input issues