Bug Fixes. (everything is complete now).