some build optimizations added