New functionality and bug fixes