Merging various updates back into the MSPARP/MSPARP repo