fixed some errors that were still occurring in the .ts files (plus one in the acceptance tests)