Moved the /Zm and some bug fixes