transition guide added (work in progress); some minor guides fixes;
merged changes