added german support and small changes