plot.py: added annotations plus some various fixes