refining controls a bit, still needs work