Individual mode bugfixes and speed enhancements.