Further automatization added to the annotator, fixed smaller bugs