Added some tweaks and fixes that should stablize this for 13 release