fixed some errors, testing phase commencing