adjusted function names, and added functions for other types