revised after todd's comments

mostly amp stuff