Updated components... and minor fixes.