Some fixes

Also added bot -> chan chat