code clean up and addition of new components..