updated annotations and some improvements