Minor code improvements + links update.