Last bug fixes in installer. Ready to merge.