More code changes and add build instructions.