Minor changes and fixes, added star shape base class