Updating annotations and README