Continued updates, minor bug fixes.