I'll work on your suggestions once I get home.

Also yea, I would like an edited version