Some bugfixes, for example removing unnessesary table tags