Bug fixes (mainly with bot +correcting itself)