Base merged with core.
Updated, small bug fixes.
Use corrections.