[PR] Deleted type to text macro
[PR] Fix one bug... awake 30 more!