Added some new data, some minor clearup in control code