Some small changes

Still have problems in company and hospital