Misc change, removed print_r statment, cleaned up for Dinish