slight changes, errors still occuring