- add plot_ibeam
- many tidy up things