Fixed bugs, added Country