Bugged are gone (hopefully) and added the x an