frist run fixes