test stability and tidy up
licence headers
removed println