tools tidied up a bit and blocks added