Port remaining features from IFB practice hack#225

idlechild merged 6 commits intotewtal:mastertewtal/sm_practice_hack:masterfrom

idlechild:masteridlechild/sm_practice_hack:masterCopy head branch name to clipboard