Fixes here and there, comments welcome.