Re-organized misc.