fixed issue and things