Final details and bug fixes