fixed notes issue and added new fields