some tidying up, made auto installation work