Minor type tweaks
Added simple GUI for testing.