Added/removed more files through local.xml. Fixed several issues.