more bugfixes because I'm not testing locally