Loads of little changes and bugfixes to the two -MSI functions. Getting better and better!