Fix unit generation and add circle selection