made some more functions work