fix links... this should be refactored also :-(