Updated bat, shell and make files