master installation, few fixes