Changes to annotation interface (thanks Cesar!) and a bunch of changes to matlab scripts