Fix link and other improvements