Small changes
bug fixes