last few fixes

Signed-off-by: StevenRS11 <stevenrs11@aol.com>