Minor changes to JavaDoc, logging