performance changes
bug fixes