More work on firstrun script