Updating latest round of bug fixes