fixing warnings and small code issues

author: nhhughes
fixed all warnings

author: nhhughes
fixed all warnings

author: nhhughes