Update comments and adjust front end to account for @niczak 's changes.