toy-tail not spacecat
Valgrind clean
Free before adding always
Consistency and clean up