REFACTOR - Changed javaDoc some, mostly to test new way of commiting...