Solitonic and Non-Solitonic Q-Stars