minor modifications/annotations