renamed major components
minor updates