Minor improvements
Improvements based on T.H. development