Added Currency converter and some fixes