added edit features + redone the timer