Fixed sign glpyhs and some clean-up.