Fixed the .bat and corrected minor mistakes found during compilaton