Finishing touches, code documentation fixes, etc