wait not fully working; minor opts