more cleanup and exploration (WIP)