Added wiki functionality and fixed bugs :D