removed unused LOG statements, minor improvements