More changes; implement bot adoption; syntax fixes