changed logs
merged logging
cleanup