selector fix
bug fix
cosmetic changes