minor debug and restyle