Minor Improvements for Beta

Signed-off-by: DonnOMalley <DonnOMalley1030@gmail.com>