Hot-fixes and adding quick howto run this.