restructured
fixes
timeout option added + some fix