Continued updates of existing code

Signed-off-by: Mark Tompkins <mtompkins@firmusgrp.com>