add pc
minor cleanup
fix op mask