Correct static var typo.
Tidied TODOs and JavaDoc.