added a few commented suggestions