Made some changes to internal stuff.