added popup, changed prefereces a bit