fixed some more functions