Fixed a few bugs, removed annoying popup.