Some Small Fixes and Testing