Add TODO comments
Extend technology part
Minor grammar fixes & stuff