Installation instructions improved and other fixes