Added missing components

Added missing components
Fixed all code issues

Fixed all code issues