Cleaned some stuff up, added to design doc.