Final fixes and beautifying