cleanup and some new instructions