bugfixed some bugs
Fixed some bugs