Further testing
Some small changes