some cleanup, some unknown additions