more patches...

Happy New Year.