Minor changes here and there. Still FIXMEs left.