Documenting features, added helper functions