- Minor edits and debugging