name changes and better documentation