rework install a bit