start plotting code
bug fixes
tweaks