Added better implementation of Country, fixed some bugs, monday