few modifications, updated install