bug fixes

with added bugs...