fixes for white spaces