20130626-2000

Final meta tweaks, other little fixes.