Improved comments and some names.