more changes to rid errors

changing codes to get rid of some more errors and still continue to
test