Quick Fixes - BEF

list of changes listed below.