Small Fixes

Checking for correct comments and buildability. Also, making all global
variables to be static.