fixed problems
fixed more bugs