added price watch
price watch now works
fixed merge issues