cleaning up manifest and templates a bit