Split/add and fixes

Well, in particular, I was wondering if the frontend (javascript) should be doing this munging.