added a few bits & pieces...