fixed some bugzzzzz