Some scary changes to how the components are stored. Also some input fixes.