Updated some Code, Removed Batch Files