cleanup
small fixes