Added Small Bug Fixes