Installation steps and bugfixes