refactored a lot; got basic wiki links working