Added code for installer unpacking, replaced constants