Bug fixes, cleanup.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
Merge pull request #31 from FellowTraveler/gui

Bug fixes, cleanup.