fixed some todo's