Fixed initialization of components
Forgot debug code
Removed redundant lists
Merge pull request #10 from govertbuijs/master

Some optimizations