Merges in a few bug fixes. (Hopefully, another update will soon follow hoping to fix some new syntax fails and a couple of others bugs)