Solves point 1.2
Minor fixes