add helper for console logging, remove some old references, clean up a bit