Made some changes based on hardware results
The hardware results now look cleaner...