expandtab and some improvements to prog2 a3