earies/patches

random code patches