javadoc, fixed bug with component init, clean up
clean up