random fixes, less persistedlever