fix bugs in amp version, still working
clean up code, seems to be working
clean up code, remove comments, etc
add Makefile merge map