fixed bugs...more dynamic expressions now