Fixed annotations and comments