this should fix image issues and some bugs