fix reserved word rewriting
fix incorrect integer bit calculations