Minor Fixes, testing