Readded csv and bodyfile support
Fixed minor bugs
Made full path calculation more efficient