Misc changes and added latest main script bat