Some more cleanup templates are now functional, minor glitches