File path bugs fixed