cleaned up some differences between new development branch and main branch