adding file loader (WIP) and other improvements