Added more entity linkers and fixed debug circle and debug square entities

Signed-off-by: Sam Hellawell <sshellawell@gmail.com>