Fixing instance issues. Much normalization.