Fixed bug where negative velocities were being set as line width. Added some testing of preprocessor macros.