Minor fixes, added peripheral events