a few changes to proto.js after review