added and fixed annotations