Some general cleanup. Still missing template.php from mvegh.