more bugfixes, prep for better messages