some small fixes, a few new party tricks