more correction from timo
finishing corrections