formatting
small fixes and debug