Some tweaks and working fileInfo now