Revert "Build with O3 by defualt - HAHAHAHA let's see...."

This reverts commit 1e10ccc726273bb30dc954bcd20a4b12f942947d.
Revert "Some enhancements"

This reverts commit b9347dc0e59e05725cdf45ec57f57daf1bc902d5.