Updates and more error fixes. blah blah sleep.