Formatted more stuff and fixed paths