misc tweaks. pushing all but Array
done tweaking. niki: do the last one Array.hs