v0.4 bug fixes, 2 new methods