fixing stop codes
working some more on the UI