Added better borken link handling. 
Updated build files.