fix bugs
small changes