several changes/updates