More cleanup of descriptions and such