Fixed everything, added entity listing, final release for now