Added amplitude reading and tidied warnings