Made bugchanges and more