lots of working code added and & fixed.