Whoa... Looks like your trying to do a serious overhaul (at least from what I remember reading before)...
Sorry, I can't do a review anytime in the immediate future, but you may want to just post these chapters as new installments to keep the originals for reference.