Fixed some issues and added stars