small fixes, delivered version