intermediate state (some bug fixes)