Did some minor cleanup and added a few new features. Not much new material, though. Sorry it's taking so long.