Dealt with some issues in notes