fixing order in FreeFramework; cosmetic changes