Rest of the Code-Optimization.

5 warning corrected
core untouched