Fixed some small bugs and added 'None' pulse