- added new expr things in and performed clean up
- added better test cases