Finally deployed

Lots of fixes / features that I cannot remember