[@Silverwind Blade] all done. Let me know what you think.