Doctor home now dynamic, some other bug fixes