File Reader fixed, misc fixes