added nibs to top and made more preprocessor macros