Further work on put & debugging