Minor fixes and xkcbot example