Add Links property; Cleanup some spacing stuff; Fix Typo