final touches, needs documentation update