NORMAL bugfixes, rewrites.