Fixed a few edge cases after running tests and made todoMelvin more usable