v4.2

What v4.1 should of been but I forgot to copy over some of the changes.
::sigh::