Installation updated + tidy up