some tiny changes made