general fixes + API update
Merge pull request #3 from strangewarp/new-ideas

general fixes + API update