stages, fixes