Fixed some more, just wait until v 0.1.000 before pulling!