Addresed some issues
Signed-off-by: David Dorfman <wiz3kid@gmail.com>