1/2 Parse refix / General Updating

I'll do the rest tomorrow. >.<