Various modifications/fixes.