Tasks 7/24-25

Vertical whitespace, a few bug fixes, and some updates to TODO