overhauled installation system, other minor changes