Additions, cleanup