Fixes some bugs, enhances expressibility.