some performance improvements (became faster ;-) )