Fixed up bugs.