More system level fixes and updated docs