Dan's additions under modes/
Dan's customizations rebased on vmalloc's