* implemented / removed some todo's