Filling in more
Clean up docs and formatting