Extension guidelines. Some other fixes.