Improved date conversion
Improved stability on delete
Added todo