some additional comments and clean up