updated with some more fixes based off of my test unit