Javadoc for my components, clean up of Activities

I think I got all the stuff that I did, but let me know if I missed
something.