Dox updates, better space parsing now.