some cleanup of console logs
initial watch track implemented