Added todo, extra check and removed some dots (confusing for manual copy)