few changes
bug