Need better checking of serial data to ensure that serial data comes in properly, ugly hack put in for now.