Fixed KPITask when baseline is 0, added TODOs