! backport some of the bug fixes and features to the old version
! smf->elk changes
Signed-off-by:Spuds <spuds@spudsdesign.com>