fix regex for split / and ?, then add john's changes #35