refactor and some debug helper visuals