Removed funtions that weren't overloaded. Fixed ws->os.