bugfixes from Dean Gores,