Dutch commit

fixing minor parentheses bug. Adding support for two more functions