One more update (For now)

Mostly comments