Added some line-drawing stuff and macros for entity creation