remove debug
small fixes