try and fix some of the issues