Fixed optimizations and overall betterness.