custom and core updates

Signed-off-by: Gordon Makely <gmakely@duoconsulting.com>