Performance updates

Updating the project with progress we've had in place for a while elsewhere. Corrects a few bugs and removes the need to reload after the first provision.