Bug fixes from testing

All components are now working as expected in sunny
conditions and most negative conditions. Still need to
check for loop dependencies and multiple inclusion.