fixes and annotations