More code clean up and bug fixes

Adressing #138 to add a more reliable check for collapsed side
boxes/columns

Continuing with #139 and cleaning up code, commenting, etc.