Made Several Fixes