multipart resolution and edited some todo's