Minor changes
Small optimizations
Rename
Add timout test