updated to reflect current status.
fixed FindBugs warnings