Additional fixes and improvements. Beginning release candidates.