Couple of bug fixes, plus a handful of doctrines and part two of philemon