- updated descriptions, cleanup