Add a few comments, make buildable again