- Minor edits and testing