added (uncommented) compiler optimizations