fixed tabs again
some small modifications