Minor additions, cleanup