Added other options and optimizations. This is v1.8-RC.