fixed register mapping and minor typos