Improve error message
Add some more stdlib functions