bug fixes and new bugs added :-1:
fix stars