finishing implementation progress, last fixes