Brought hand to 100% coverage and made minor fixes as well