Update build instructions
More cleanups in the API