cleanup & selection bug