more fixes
stuff
fix bugs from constant expressions