Added comments for new functions, less ambiguous names