Some fixes. Still have an ugly bug with shitty formatted wiki document:(