Fixed Errors

Everything working now on the new branch.