tweaked setup script
updated update script
ready for merge