Made units stack, added cyclical selection of units/cities