Added timeout s/d/m/h + more clenaup