Fixed focus issues and removed the "ugly" 50 milli timeout