changed all bugs