character selector cleanup done - might be broken here and there