New function names and changes to clarify library behavior. These edits resolve #4.