Rewrite simplifying rules

Does things recursively now
Add more simplifications