Marvin warrior (upgraded/fixed)

An upgraded version of my earlier Marvin warrior, which wasn't printing well.