some more features

ok, wasn't that big of a deal ;)