Added timeout options + some other fixes

(still missing some languages for the next release)