added wiki and tweaks