some small details changed/prettied up