improvements help texts
minor improvements to handle data