Fixed a malloc, added a new define