Made some changes to geometry, added in better licensing, and made
AdvancedMercEntity!