Life hack tweaks, added TODOs.