timer aded, some fixes