Initial work on DnD, misc fixes