more random fixes due to factorization and rename