Fixed spelling of descramble map
Updated makefiles to build into directories
Added dummy makefile
Added routines for profiling
Cleaned up unused variables