additions, cleanup