added popup warnings in crucial places