minor changes + some clean up