Fixes for file i/o, Goals tweaks