Add missing comment.
Variable declarations.
Improve error handling in declarations (still needs work).