camelCase, minor GPL block update, few TODOa