Rework entity link response
Fixes #8
also replaced a bunch of occurrences of "self.Entity"
and cleaned up some code