fixes, running in full