refactored lockfile, functional installation