adding NONE and fixing doc strings