updated comments and tests for new features