Extra commenting plus general reorganization

Moved things around minimally and just generally grouped them by "theme" instead of just generall when it felt appropiate to have them around.