hopefully last of bug fixes...