Add debugging, update Util.java