Fix some bugs
Still need to look into the intelligence ordeal