fixed misc stuff from full run