Commented the non-working star stuff for now
Stabilized, contains some fixes