Updated some #defines and global variables, clearer names, alignment, etc.