Speed improvements, hitting enter always works