fixed errors: final version/testing remaining