Small Fixes And Testing