fixed timer issues and add extra picker