Add arg to catalina, get rid of bat files