Fixed bugs, narrowed it down to 1 remaining error