Fixed an issue with normal play index file generation and
clean up. Testing still in-progress..