Answer final question, misc cleanup