Updates for GitHub issues #3 and #4

Closes #3 
Closes #4 

Also added in signal names for debug purposes