1) refactor, 2) hitting enter on about now works