adding currency switcher + some code fixes