mac bugs fixed, more file logic