Fixed some more bugs in new code