progress on goto; removed some prints