Removed limits. Refactored to remove build warnings.