bug fixes; updates
bug fixes