minor changes, final push