Law review

Notes and cleanup from reviewing Daniel's law branch