fixed some problems
fgfg