remove debug
small tweaks
tweaks