Quite some stuff I added/fixed during usage

Some things slightly change the API - to the better imho, so take a look and let me know what you think.