changed entry constructor slightly and another todo