changed more minor stuff (waiting for wife)