Added detail and register, fixed others