Regex fixes, TODO notes. Got my work cut out for me...