Continued bug fixes and minor updates.