various fixes. worthless message, I know