removed some old and fixed things.