fixing links and other misc problems