Bug Fixes and more Testing