ported logging from my branch; removed the Evil stopSelf; minor clean up