added and tested some more funcions