bard trainer, and map -2 fixes