[@Little_ninja] My bad, I thought you said it was ok to post after I finished the fixes.