removed linktest
some changes made, but adr not working
Merge branch 'nathan' of github.com:mammothbane/wave-stable into nathan