Fixed another self referencing issue
Misc. small corrections