finished some todo