Remove error alert, and a couple of bugfixes