Completed shift to 4.1.5, I hope. Fixed a few bugs and cleaned things up a bit.