guides fixed/improved