removed unused code - began to merge alpha specific stuff - added mac macros for...