some fixes + a little gui