Fix a few things, make better comments