Cleanup, bug fixes.

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

Cleanup, bug fixes.