Added some comments, changed serial message
Fixed merge conflicts