API changes

see #33, #32

Diffs are much better now, beautify FTW!