some bugsfixed