Added debug prints, better error return values.