Added more functions, made it parse whitespace correctlly. Fix error handling functions inside brackets