Some code clean-up and minor tweaks. Also changed the project description again, hopefully for the last time.