Updated status and side TODOs [ci skip]