Minor changes to merge into rover control application. Public declarations and some names