Continuing pop ups; bug fixes