Updating references... and changing the look and feel a bit.