Fix accidental firing of shortcuts when renaming. closes #87

Along the way I needed to fix some null pointer exceptions that originated in DavidBormann's code.