Rasta maintenance; minor fixes. Added old annotate_panel for reference.