Finished messages and bug fixes