fixed stuff
committed again?
fixed empty string problem