added nice plotting macros and cleaned up a bit