Implemented minor performance gains.