General cleanup. Missing template.php still.