Ed: correct cmakes
Ed: Make some functions public