fixes from latest round of testing

includes initial commit for online controller