update for best practices

closes #55 and closes #53
fix tests
removed unused amd modules.