removed annoying text-entry behavior
minor changes, cleanup