continuing bugfixes because I'm not testing locally