Added some Log.d, toString()s, etc.