Api adjustments

fixes a bunch of issues from #9