Added some finishing touches, for now.