I think I've fixed all bugs