scan-build: fixed null dereferencing
renamed modules
added todos