Debugging, renaming, adding docs