rebuilt due to corruptions. style fixes.