implemented 2 of the missing functions.
now only 2 more are missing :)