Fixed 'add <item> note' bug (I think). Also cleaned up code slightly and edited some error messages