Modified several things.