Minor fix updates

Improved particle management, removing some unnecessary duplication of
code that might cause problems.

Changed fade-to-black code to work at the correct time.