mostly code-style corrections on the gui