some more things implemented