fixed wierd lines in class diagram, went through and checked to see code was mostly following coding convention
updated javadocs, but they look wierd when I open them