more gui. cleaned up