Tidied up examples
Updated build