A tools update.. Working out bugs