Some improvement

Improvements by timmyArch