latest changes
bug fixes