Adding some small optimizations and testing.