got rast_annotate in good shape