Imenu support, and some minor bug fixes after using it all for a day.