.mainwrapper minor changes