fixing components
some work on systems