cleaned up init
updated logging