more overall fixes, blabla