Uncomments some necessary code.
Performs some minor fixes.