Added more stuff to xsthammer, found first xst bug