Add some tweaks
time to optimize the system a little bit
thanks to mike1985.