Maintenance update with bug fixes and editor loading optimisations.
All and any optimization effort are always most welcome :)