Finished, i think
Minor tweaks