Fixed mistakes from previous commit.
Cleanup and Fixes.