more first run updates #21