suppressed logging and fixed reference issues