fixes, fixes everywhere