Fixed some logic bugs
moving up to v0.4.2