Impact to the Head: Bug fixes

Fixed bunch of very small bugs