changed index back to tables
changed order (bugs first)
added fixme to tournaments, work in progress