changed some names, fixed a few comments