annotations and fixes